CS12 Support #117

marcparadise · 2015-03-04T07:58:16Z

This PR brings chef-zero behaviors in line with CS12 as of 12.0.5

It also removes support for chef-pedant, because the repositories oc-chef-pedant and chef-pedant are being merged.

Some of these changes (specifically around admin and private key flags in clients)are not backwards compatible with OSC11 behaviors.

marcparadise · 2015-03-04T07:58:30Z

Some minor cleanup still planned, this is just a preliminary PR.

tyler-ball · 2015-03-04T20:22:55Z

\cc @lamont-granquist @danielsdeleo @stevendanna @jtimberman per the Chef maintainers file

marcparadise · 2015-03-04T20:23:57Z

Oops, thanks @tyler-ball

tyler-ball · 2015-03-05T00:02:58Z

Also @jkeiser

marcparadise · 2015-03-06T19:49:01Z

I would like to get this merged in as soon as is reasonably possible - at this point the merged oc-chef-pedant is on master, and chef-pedant has been deprecated. While current master of chef-zero will continue to work as-is because chef-pedant is pinned to a version, all new tests will be getting added to oc-chef-pedant.

jkeiser · 2015-03-10T16:32:50Z

Note I am out this week.

stevendanna · 2015-05-27T14:20:54Z

lib/chef_zero/endpoints/organization_user_endpoint.rb

@@ -20,29 +20,7 @@ def delete(request)
        json_response(200, ChefData::DataNormalizer.normalize_user(user, request.rest_path[3], ['username'], server.options[:osc_compat]))
      end

-      def post(request)


Rather than removing this I think we need to move it and slightly change this code. The actual endpoint that does this is:

POST /organizations/ORGNAME/users

with a body of {"username": "USERTOADD"}

Does the Chef Server support both endpoints? POST /organizations/ORGNAME/users and POST /organizations/ORGNAME/users/USER? If we want chef-zero to emulated CS12 I would think we want want it to do whatever CS12 does. I'm not sure when the endpoint was changed so I don't know when the old one was deprecated.

The current chef server only support POST /organization/ORGNAME/users/. I don't think there is a version that supports POST /organizations/ORGNAME/users/USER but I haven't look extensively.

I've moved this in andrewjamesbrown@0447018 which is part of #146

tyler-ball · 2015-06-09T20:11:18Z

lib/chef_zero/endpoints/actor_endpoint.rb

@@ -65,7 +65,13 @@ def put(request)
          else
            response = FFI_Yajl::Parser.parse(result[2], :create_additions => false)
          end
-          response['private_key'] = private_key if private_key
+
+          if request.rest_path[2] == 'clients'


This is super confusing branching logic - I would expect to see actor_endpoint_spec.rb updated. Unless all the testing is through pedant?

tyler-ball · 2015-06-09T20:12:52Z

Just as side note - if this removes CS11 functionality this should be released as a major version update. And it looks like you're doing that as I just saw in the Changelog :) Thanks!

tyler-ball · 2015-06-09T20:17:11Z

Gemfile

@@ -3,7 +3,7 @@ gemspec

 gem 'rest-client', :github => 'opscode/rest-client'

-gem 'chef-pedant', :github => 'opscode/chef-pedant', :tag => '1.0.46'
+gem 'oc-chef-pedant', :github => 'opscode/oc-chef-pedant', :tag => '2.0.0'

 gem 'chef', :github => 'opscode/chef', :tag => '12.1.0.rc.0'


This can be updated to 12.3.0 (or at least not the RC version)

Updated in #146

tyler-ball · 2015-06-09T20:18:12Z

Is this stalled? We would like to see it merged so we could get chef/cheffish#50 merged.

andrewjamesbrown · 2015-07-04T01:10:35Z

@tyler-ball, hopefully I've addressed the concerns. I'm also keen to see chef/cheffish#50 merged. Thanks!

This commit re-adds support for POST /organizations/ORGNAME/users. Since the code is very similar to /organizations/ORG/association_requests, we introduced a helper module to avoid code duplication.

tyler-ball · 2015-07-10T17:27:01Z

I just did a rebase on master and force-pushed

tyler-ball · 2015-07-20T20:35:56Z

Poking this - I think the only task left to do is update the gemspecs to depend on pedant from the chef-server repo, then test against that. @marcparadise do you agree?

marcparadise · 2015-07-21T21:11:15Z

Yes, looks like it.
On Jul 20, 2015 4:36 PM, "Tyler Ball" [email protected] wrote:

Poking this - I think the only task left to do is update the gemspecs to
depend on pedant from the chef-server repo, then test against that.
@marcparadise https://github.com/marcparadise do you agree?

—
Reply to this email directly or view it on GitHub
#117 (comment).

Use the embedded pedant in the chef-server repo. This also requires slight changes to the pedant configuration, as the options have changed.

andrewjamesbrown · 2015-08-06T17:12:43Z

I've updated the gemspecs in #151. Note that there are a number of failed tests now: 1366 examples, 130 failures, 19 pending

andrewjamesbrown · 2015-08-10T19:31:32Z

@tyler-ball, I think the remaining task is complete, but I'm a little concerned that there are now some failed tests with Chef12. Please let me know if there is anything else I can help with.

Switch to pedant in chef-server repo

tyler-ball · 2015-08-11T21:03:48Z

@andrewjamesbrown Unfortunately it means that chef-zero probably needs to be updated to bring its behavior in line with CS 12 still. @marcparadise do you have time to look at the failures?

Chef Zero does not yet 100% support CS12, hence we need to disable several of the failing tests until the code is written.

Adding preliminary support for the _identifiers REST endpoint.

andrewjamesbrown · 2015-08-12T13:04:41Z

@tyler-ball, @marcparadise I've submitted #152 that makes the build pass. I've removed several of the failing tests from the pedant config, and added a new _identifiers endpoint.

marcparadise · 2015-08-12T17:34:50Z

@tyler-ball unfortunately I'm tied up with other projects and DoD Pittsburgh for the remainder of the week. @andrewjamesbrown thanks for the PR to get past the errors!

marcparadise · 2015-08-12T17:46:52Z

I've opened issue #154 to cover server API versioning behaviors.

Andrewjamesbrown/gemspecs

CS12 Support

marcparadise added the in progress label Mar 4, 2015

chef-supermarket added the Signed CLA label Mar 4, 2015

marcparadise force-pushed the mp/merge-pedants branch from 8698f90 to 59239b5 Compare March 6, 2015 19:50

chef-supermarket added the Signed CLA label Mar 6, 2015

stevendanna reviewed May 27, 2015
View reviewed changes

stevendanna mentioned this pull request May 27, 2015

Use correct user-association endpoint for Chef 12 chef/cheffish#50

Merged

tyler-ball reviewed Jun 9, 2015
View reviewed changes

This was referenced Jul 10, 2015

Multiple API support in pedant chef/chef-server#383

Merged

Update gem dependencies #146

Merged

chef-supermarket added the Signed CLA label Jul 10, 2015

marcparadise added 8 commits July 10, 2015 10:16

update chef-zero to be fully compatible with CS12

2758425

integrate oc-chef-pedant 2.0 for cs12, drop chef-pedant support

fd95d9e

cleanup a TODO left behind and clean up some debug code

ad69f42

use the supplied org_type in org creation

eb7ee61

update oc-chef-pedant gemfile and remove chef-pedant gemfile

d0a1484

remove multitenant from pedant config, no longer valid

aa95900

Force complete deletion of org on DELETE request

a921e1a

Set oc-chef-pedant to the 2.0.0 tagged release, remove WIP comment

b2381bf

Andrew Brown added 2 commits July 10, 2015 10:25

Support POST /organizations/ORGNAME/users

4366f5e

This commit re-adds support for POST /organizations/ORGNAME/users. Since the code is very similar to /organizations/ORG/association_requests, we introduced a helper module to avoid code duplication.

Bumping dependency to chef 12.4.1

113e41e

tyler-ball force-pushed the mp/merge-pedants branch from 399c389 to 113e41e Compare July 10, 2015 17:26

chef-supermarket added the Signed CLA label Jul 10, 2015

Switch to pedant in chef-server repo

aabb201

Use the embedded pedant in the chef-server repo. This also requires slight changes to the pedant configuration, as the options have changed.

Merge pull request #151 from andrewjamesbrown/andrewjamesbrown/gemspecs

64dfcde

Switch to pedant in chef-server repo

chef-supermarket added the Signed CLA label Aug 11, 2015

Andrew Brown added 2 commits August 12, 2015 08:46

Disable CS12 pedant flags

ae7634c

Chef Zero does not yet 100% support CS12, hence we need to disable several of the failing tests until the code is written.

Preliminary support for _identifiers API

3197fc4

Adding preliminary support for the _identifiers REST endpoint.

tyler-ball mentioned this pull request Aug 12, 2015

Add /organizations/NAME/nodes/NAME/_identifiers endpoint #152

Merged

Merge pull request #152 from andrewjamesbrown/andrewjamesbrown/gemspecs

67b0d4b

Andrewjamesbrown/gemspecs

chef-supermarket added the Signed CLA label Aug 12, 2015

tyler-ball added a commit that referenced this pull request Aug 12, 2015

Merge pull request #117 from chef/mp/merge-pedants

3116c8c

CS12 Support

tyler-ball merged commit 3116c8c into master Aug 12, 2015

marcparadise removed the in progress label Aug 12, 2015

tyler-ball deleted the mp/merge-pedants branch August 12, 2015 18:12

jkeiser added the enhancement label Sep 2, 2015

chef-supermarket added the Signed CLA label Oct 12, 2015

thommay added Type: Enhancement Adds new functionality. and removed enhancement labels Jan 24, 2017

chef locked and limited conversation to collaborators Nov 16, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CS12 Support #117

CS12 Support #117

marcparadise commented Mar 4, 2015

marcparadise commented Mar 4, 2015

tyler-ball commented Mar 4, 2015

marcparadise commented Mar 4, 2015

tyler-ball commented Mar 5, 2015

marcparadise commented Mar 6, 2015

jkeiser commented Mar 10, 2015

stevendanna May 27, 2015

tyler-ball Jun 9, 2015

stevendanna Jun 9, 2015

andrewjamesbrown Jul 4, 2015

tyler-ball Jun 9, 2015

tyler-ball commented Jun 9, 2015

tyler-ball Jun 9, 2015

andrewjamesbrown Jul 4, 2015

tyler-ball commented Jun 9, 2015

andrewjamesbrown commented Jul 4, 2015

tyler-ball commented Jul 10, 2015

tyler-ball commented Jul 20, 2015

marcparadise commented Jul 21, 2015

andrewjamesbrown commented Aug 6, 2015

andrewjamesbrown commented Aug 10, 2015

tyler-ball commented Aug 11, 2015

andrewjamesbrown commented Aug 12, 2015

marcparadise commented Aug 12, 2015

marcparadise commented Aug 12, 2015

CS12 Support #117

CS12 Support #117

Conversation

marcparadise commented Mar 4, 2015

marcparadise commented Mar 4, 2015

tyler-ball commented Mar 4, 2015

marcparadise commented Mar 4, 2015

tyler-ball commented Mar 5, 2015

marcparadise commented Mar 6, 2015

jkeiser commented Mar 10, 2015

stevendanna May 27, 2015

Choose a reason for hiding this comment

tyler-ball Jun 9, 2015

Choose a reason for hiding this comment

stevendanna Jun 9, 2015

Choose a reason for hiding this comment

andrewjamesbrown Jul 4, 2015

Choose a reason for hiding this comment

tyler-ball Jun 9, 2015

Choose a reason for hiding this comment

tyler-ball commented Jun 9, 2015

tyler-ball Jun 9, 2015

Choose a reason for hiding this comment

andrewjamesbrown Jul 4, 2015

Choose a reason for hiding this comment

tyler-ball commented Jun 9, 2015

andrewjamesbrown commented Jul 4, 2015

tyler-ball commented Jul 10, 2015

tyler-ball commented Jul 20, 2015

marcparadise commented Jul 21, 2015

andrewjamesbrown commented Aug 6, 2015

andrewjamesbrown commented Aug 10, 2015

tyler-ball commented Aug 11, 2015

andrewjamesbrown commented Aug 12, 2015

marcparadise commented Aug 12, 2015

marcparadise commented Aug 12, 2015